From 3d866e058558d7a27a07f6ab21049d535d60d736 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 30 Dec 2004 12:01:47 +0000 Subject: [PATCH] bitkeeper revision 1.1159.207.2 (41d3ee2b8X5k263Pk7ShvbMkpcLkMg) manual merge --- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/e820.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 15c712f553..b7bcbaa15b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -513,7 +513,7 @@ void __init __start_xen(multiboot_info_t *mbi) e820_raw[e820_raw_nr].size = ((u64)map->length_high << 32) | (u64)map->length_low; e820_raw[e820_raw_nr].type = - (map->type > E820_NVS) ? E820_RESERVED : map->type; + (map->type > E820_SHARED_PAGE) ? E820_RESERVED : map->type; e820_raw_nr++; bytes += map->size + 4; } diff --git a/xen/include/asm-x86/e820.h b/xen/include/asm-x86/e820.h index 0767642570..6d1af01e07 100644 --- a/xen/include/asm-x86/e820.h +++ b/xen/include/asm-x86/e820.h @@ -5,10 +5,12 @@ #define E820MAX 32 -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 -#define E820_NVS 4 +#define E820_RAM 1 +#define E820_RESERVED 2 +#define E820_ACPI 3 +#define E820_NVS 4 +#define E820_IO 16 +#define E820_SHARED_PAGE 17 #ifndef __ASSEMBLY__ struct e820entry { -- 2.30.2